Merge
Updated to 1950
Merge branch 'master' into gh-pages

Conflicts:
	static/js/data/changes.js