Merge remote-tracking branch 'origin/master'

Conflicts:
	test/mandate.tests.js
Merge remote-tracking branch 'origin/master'