Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js
Merge commit 'df438ac5caf6f6895761e15f57d9318c86148f9b' into gh-pages

Conflicts:
	target/gls2.js