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