Update api to v3
Merge branch 'api3'
Merge branch 'master' into gh-pages