Merge branch 'master' into ticket466
refs 466: do not display the img/@src text input when editing the description
Merge branch 'ticket466' into testing