Fix for #363 change the way a media scan is triggered.
Merge pull request #367 from BlythMeister/MyBetaVersion

Fix for #363 change the way a media scan is triggered.
Merge remote-tracking branch 'Upstream/release' into Upstream_develop