update_master_data failed: refs #405
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/users_controller.rb