Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/PageRoutingGadgetSpace.js

Publish new version for extended window configuration fix.