Merge pull request #761 from bhariharan/unstable

Merge branch 'master' into unstable
Replace deprecated methods