Version 3.6.2

You know the drill :)
Merge pull request #720 from getusedtoit/master

Version 3.6.2