Merge with default

--HG--
branch : candidate
Merge with candidate

--HG--
branch : release
2.5.4

--HG--
branch : release
Added tag 2.5.4 for changeset 1008d6f64552

--HG--
branch : release
Moved tag stable to changeset 1008d6f64552 (from changeset c6861eff400a)

--HG--
branch : release
Moved tag unstable to changeset 1008d6f64552 (from changeset c6861eff400a)

--HG--
branch : release
Merge with release

--HG--
branch : candidate
Merge with candidate
icons for external web forms and gmail gadget.
misc tweaks and fixes
Highlighting dragged over columns in kanban details view
Fixing label
Caching email template dataAndLabels to improve performance
Merge
Merge