Merge remote-tracking branch 'upstream/master' into 93_option

Manually resolved conflict in:
	test/src/ui/js/test_Api.js
Fixed ApiSpec for submitOptionValues to match new timestamp format
Merge branch '93_option' into 90_mood_swing

Manually fixed conflicts (line endings) in:
	test/src/ui/js/test_Api.js