Change task to layout for 3.2
Merge remote-tracking branch 'origin/develop' into develop
Change layout to task for tags in 3.2
Set $xhtml to false for & and not &amp;
Must check task for user layout