Update to latest api checkins
Merge remote-tracking branch 'origin/master'