c
Merge branch 'master' into github

Conflicts:
	changelog.txt