Merge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https...