Squash dev branch commits to master