Merge pull request #4239 from etactica/error404-messages