commit for pull request
Merge remote-tracking branch 'origin/master'

Conflicts:
	version.xml
Changed LOTS of things in preparation for new release