Merge branch 'master' of https://github.com/jcamachor/incubator-calcite into CALCITE-513