Merge branch 'master' into 20141219-KED-52

Conflicts:
	src/includes/about-us-form.php