1.7
Merge pull request #662 from Mexahoid/patch-16

1.7