photo/frontend — pull request #1489 by hfiguiere (2014-05-22 13:06:55+00:00)
Title: My bugfix branch against 4.0.2-rc4.

Feel free to cherry-pick or merge.