Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 22efd48fd42104a2526eef58cad543d4abbb83b5

 remoting_client/examples/sites_ftp_user_update.php

@@ -15,7 +15,7 @@
   }

   //* Parameters
   $client_id = 1;
   $client_id = 0;
   $ftp_user_id = 1;