Fixes issue #235 and #234 in which merged templates raised an error when opened with Word and images were not properly rendered