Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-939
Merge branch 'TAJO-939' of github.com:hyunsik/tajo into TAJO-939