Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 remoting_client/examples/sites_shell_user_update.php

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

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