Merge branch 'identity' of github.com:dragonsinth/curator into identity