Merge branch 'master' into 'mww_tei_ead_and_itemdisplay'

# Conflicts:
#   pom.xml
2 jobs for mww_tei_ead_and_itemdisplay in 46 seconds (queued for 2 seconds)