Merge branch 'master' into 'master'

Marius Cramer

2015-07-20 1f50209744f36c1602b11a3787dacfd3ea76527e

 remoting_client/examples/sites_ftp_user_update.php

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

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