Merge branch 'trunk' of https://github.com/apache/hive into trunk
Merge branch 'trunk' of https://github.com/yhuai/hive into trunk