Merge pull request #620 from bhariharan/unstable

Merge branch 'master' into unstable
Bumping up default API version to v31.0