Merge pull request #605 from dburdick/release-16

registration fix