Merge branch 'master' into 3.2/master
Fix composer and tinymce
Merge branch '3.2/master'