Merge branch 'saucelabs-test-fix' into saucelabs-tests

Conflicts:
	Gruntfile.js
	package.json
	tests/mithril-tests.js
	tests/test.js