Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-26 498c86fbbfc4aa034758693309dd97b7ca4ef4f0

 remoting_client/examples/sites_shell_user_update.php

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

   //* Parameters
   $client_id = 3;
   $client_id = 0;
   $shell_user_id = 1;