Merge branch '14-incorrect-301-redirect-to-homepage-when-404-would-be-expected' into 'develop'
Resolve "Incorrect 301 redirect to homepage when 404 would be expected" See merge request !16
Resolve "Incorrect 301 redirect to homepage when 404 would be expected" See merge request !16