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