Merge of the 'dev' branch into the 'master' branch

This includes the iOS API updates and new Quickstart as well as some test code improvements.