Merge branch 'master' into persona

Conflicts: src/lib/Hydra/Helper/CatalystUtils.pm src/root/layout.tt src/root/topbar.tt src/root/user.tt

Created by  Eelco Dolstra  on November 5, 2013
GTXYNFUKUWXM5KO2FOJ5RHAMT7GMHABIVMERLA36COZ4ZZ4S2NKQC
Dependencies
In channels
main
upstream
Change contents