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