Cherry-pick fix for #190 into stable.
Updated version number