Add six to travis harness requirements.
Merge branch 'issue259' into devel