Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-21 856a3fda5a9c7a59bc89e3ac4800465e7b72c591

 interface/web/mailuser/mail_user_password_edit.php

@@ -51,7 +51,8 @@
class page_action extends tform_actions {

   function onSubmit() {

      global $app, $conf;
		
      $this->id = $app->functions->intval($_SESSION['s']['user']['mailuser_id']);

      parent::onSubmit();