Add .htm suffix to temp files before passing to browser
Merge commit '7b4a67881b6e0cb6c7d4edfdf2cd1217b593a9ab'