Version 3.6.5
Merge pull request #1144 from getusedtoit/master

Version 3.6.5
Merge branch 'master', remote branch 'upstream/master'