Merge pull request #938 from stevewithington/develop

semi-related bug fix #924: missing template will trigger onSite404 when ...