Add missing template that caused viewer to fail when 'Default view' selected
Not sure how this went unreported for so long...
Merge remote-tracking branch 'upstream/master'