Fix error when no valon found on python2.6 (no output argument to CalledProcessError)
Merge remote branch 'origin/master'