Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-19 dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c

 install/lib/mysql.lib.php

@@ -776,7 +776,7 @@
    *
    * @access private
    */
   public function db_result($iResId, $iConnection) {
   public function __construct($iResId, $iConnection) {
      $this->_iResId = $iResId;
      $this->_iConnection = $iConnection;
   }
@@ -902,7 +902,7 @@
    *
    * @access private
    */
   public function fakedb_result($aData) {
   public function __construct($aData) {
      $this->aResultData = $aData;
      $this->aLimitedData = $aData;
      reset($this->aLimitedData);