Add dev-4.2 which is a development/integration branch for things that are already done and need to be merged for 4.2 or are still incubating and might be done if I have enough time. :)