[pull] master from trinodb:master #625
+126
−32
Merged
Loading