Merge branch 'master' into avocet-master
Merge pull request #39 from Coenego/avocetmaster

Merged with latest Hilary master
Merge branch 'master' of https://github.com/CUL-DigitalServices/avocet-hilary into tickets-publications