Update bundled six to 1.5.2
Added GitHub issue number
Merge pull request #2006 from astrofrog/update-six

Update bundled six to 1.5.2