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