Resync dev with master

commits to the wrong branch, I hate git-flow not switching back to development...