Fixing incorrect git-svn to git merge (I hope).
Merge branch 'master' into qt5

Conflicts:
	.gitignore