Merge pull request #648 from bhariharan/unstable

Merge branch 'master' into unstable
Update gold file to reflect changed API version - test failure fix