Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle

diff --cc lib/medialib.php
index a32a34c,df3eef4..0d0bd35
--- 1/lib/medialib.php
--- 2/lib/medialib.php
+++ b/lib/medialib.php
@@@ -989,8 -989,7 +989,8 @@@ class core_media_player_swf extends cor
      <param name="scale" value="aspect" />
      <param name="base" value="." />
      <param name="allowscriptaccess" value="never" />
- <!--[if !IE]>-->
 +    <param name="allowfullscreen" value="true" />
+ <!--[if !IE]><!-->
      <object type="application/x-shockwave-flash" data="$url" width="$width" height="$height">
        <param name="controller" value="true" />
        <param name="autoplay" value="true" />
@@@ -998,10 -997,9 +998,10 @@@
        <param name="scale" value="aspect" />
        <param name="base" value="." />
        <param name="allowscriptaccess" value="never" />
 +      <param name="allowfullscreen" value="true" />
  <!--<![endif]-->
  $fallback
- <!--[if !IE]>-->
+ <!--[if !IE]><!-->
      </object>
  <!--<![endif]-->
    </object>

diff --cc lib/moodlelib.php
Simple merge