Copied changes from master
Merge branch 'v2.0-preparation' of https://github.com/europeana/uim-core.git into v2.0-preparation