Merge branch 'master' into htaccess-enhancements
Added .html file extension

Added the .html file extension to the rewrite rules. It’s somewhat
silly that we rewrite .htm but not .html
Protect against an empty colon_split variable

In case the explode function does not return an array, because there
are no colons, we’ve included a safe-guard.
Merge branch 'empty-colon-split'
Merge branch 'htaccess-enhancements'