Diff fix
Latest build
Merge branch 'master' into timeline

Conflicts:
	static/assets/js/codebrowser-min.js