Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

 remoting_client/examples/sites_ftp_user_update.php

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

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