Bugfix release. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry-picked from 133a02a115)
133a02a115