Update bundled six version to 1.8.0