Neil's update #2 - resolving #1258
Merge branch 'master' into production

Conflicts:
	Source/Chronozoom.UI/cz.js