Merge branch 'MRQL-69' of https://github.com/fegaras/incubator-mrql