Version 3.6.9
Merge pull request #1429 from getusedtoit/master

Version 3.6.9