Fix issue #4416

Conflicts:
	spec/helpers/notifier_helper_spec.rb