Version 3.6.4
Merge pull request #948 from getusedtoit/master

Version 3.6.4