Version 3.6.8
Merge pull request #1371 from getusedtoit/master

Version 3.6.8