Updated to the latest SDK and fixed fallout.
Merge pull request #409 from gavincornwell/2.1-dev

Updated to the latest SDK and fixed fallout.