Check API version before using the correct call
Merge pull request #520 from bhariharan/unstable

Check API version before using the correct call
Merge branch 'unstable' into unstable23
Merge pull request #521 from bhariharan/unstable23

Merge branch 'unstable' into unstable23