Six.u expects a string as argument
Merge branch 'six-fix'