build
Merge branch 'wmurray' into dev

Conflicts:
	release/endorsements.php