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