Pull from develop to master (OPENUCB-225: Fix Media module Wysiwyg integration)