CFY-709
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/gs/ui/tests/cosmo/MyTest.java
CFY-709