Merge "Bugfix: Using the right trex version to support both py2.7 & py3"