upgrade six to 1.6.1

issue #904