Update bundled six to 1.5.2

I originally included this as part of #1907 but saw some strange errors due to this so splitting it out instead.