See #1357
Merge branch 'v2.0.11' of https://github.com/europeana/portal into v2.0.11