Bugfix wysiwyg for img[usemap] and linked deleted when editing a media
Merge master/chiba into dev
Merge remote-tracking branch 'origin/master/chiba' into dev