Merge remote-tracking branch 'upstream/master'

Conflicts:
	root/Gruntfile.js
	root/package.json