Merge pull request #2454 from reaperhulk/reopen-master

reopen master for development on the twelfth release