Merge branch 'CURATOR-204' of github.com:madrob/curator into CURATOR-204