UX team contribution :-)
Merge branch 'master' of https://github.com/jose-soler/james