Merge branch 'dev' in to branch 'master'.