Fixes #604
Merge branch 'master' of https://github.com/projectkudu/kudu