Merge branch 'CURATOR-93' of github.com:cammckenzie/curator into CURATOR-93