Merge pull request #490 from NyxStudios/general-devel

Feature Freeze! Fixes will be applied here until 12:00AM on Friday. After that, new changes will be held to Tuesday.
Merge remote-tracking branch 'upstream/master' into general-devel