Merge pull request #404 from bhariharan/unstable

Merge 'master' into unstable
Fix for RuntimeException in test suite.