Re #1310
Merge branch 'master' of https://github.com/europeana/portal