Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master