bring v1.1 api branch up to date with master branch