Upgraded to support September 2014 release of SDK.