Merge pull request #604 from dburdick/release-15

registration fix