Hack to make it work for python 2
Merge branch 'fix-python2-check-output' into develop