Fix issue #4416

Conflicts:
	spec/helpers/notifier_helper_spec.rb
Merge pull request #5347 from AugierLe42e/markdown-strip-404

Fix issue #4416