Merge pull request #303 from BlythMeister/MyBetaVersion

Beta 5 fixes
Merge remote-tracking branch 'Upstream/develop' into Upstream_release