Bump version to 1.1m3
Merge branch 'master' into CFY-1295-improvements

Conflicts:
	setup.py