Merge pull request #852 from billhollings/master

Various fixes resulting from testing for SDK release.