Merge pull request #706 from KevinOConnor/anonidentity-20160407