All possible last minute changes and cleanup before release
Merge pull request #353 from ThePlayground/master

All possible last minute changes and cleanup before release
Merge pull request #354 from reicast/master

All possible last minute changes and cleanup before release