Generic fixes
Merge branch 'master' of https://github.com/europeana/tools.git