Re #880 - code cleaning
Merge branch 'master' of github.com:europeana/portal