See #1257
Merge branch 'master' of https://github.com/europeana/portal
See #1257