Merge pull request #630 from Grunthos/master

Pre-release bug fixes