Merge branch 'build' of https://github.com/salesforcedotcom/salesforce into build

Conflicts:
	src/classes/CaseTriggerHelper.cls
	src/classes/ChangePasswordController.cls