Merge branch 'master' into nick's-branch

Conflicts:
	osprey-dev2/gruntfile.js