Merge remote-tracking branch 'remotes/origin/master' into EXP-4090-Update_MySQL_5.6
Merge remote-tracking branch 'remotes/origin/master' into EXP-4090-Update_MySQL_5.6
Bumped version numbers to 1.4.0.0 / 1.4.0 Final
Merge remote-tracking branch 'remotes/origin/master' into EXP-4090-Update_MySQL_5.6
Merge remote-tracking branch 'remotes/upstream/EXP-4090-Update_MySQL_5.6' into 1.4.0Fork_SEB_New_Master
Fix merging MySQL stuff.
Merge remote-tracking branch 'remotes/upstream/BUG-4474_Bump_MediaPortal_version_to_1_4_000_0' into 1.4.0Fork_SEB_New_Master