Merge branch 'CURATOR-235' of github.com:oza/curator into CURATOR-235