Fix #1643 - Upgrade six to 1.6.1