fix based on graphx/pull/97
Merge branch 'tresata-graph' into tresata-graph-cdh4