Experimenting with auto-merging after build success on dev-master.

I'm really not sure this is going to work, but it's the simplest thing.