[pull] master from trinodb:master #636
+27
−20
Merged
Loading