Version 3.5.2

Getting ready for our new release early next week
Merge pull request #259 from getusedtoit/master

Version 3.5.2