Version 3.8
Merge pull request #2208 from getusedtoit/master

Version 3.8