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