Hotfix merge:
commit6ad6eeb83aa0d794648dd44b5dd5aed319b9c890
authorGuy Brand <gb@unistra.fr>
Mon, 20 Feb 2017 19:37:45 +0000 (20 20:37 +0100)
committerGuy Brand <gb@unistra.fr>
Mon, 20 Feb 2017 19:37:45 +0000 (20 20:37 +0100)
treed6e8c1fc0f4bb07880871f767e562aed341e1b8c
parent2526206098c99ed435c43860fe01382eee307196
parent73f84337c2da6be239f59f449d22eec14c421a13
Hotfix merge:

  Fix calling undefined function random_int() in install.php (#1852)
  Check for overwrite in media manager (#1853)