Grunt once more with feeling!
Merge remote-tracking branch 'origin/master' into amd

* origin/master:
  Grunt once more with feeling!

Conflicts:
	js/vex.combined.min.js
	js/vex.dialog.min.js
	js/vex.min.js