bugfix
Merge branch 'i20' of github.com:XingCloud/incubator-drill into i20