fix the warning about using $clientdir when i am supposed to use
$rsu_data->clientdir
Merge remote-tracking branch 'origin/development' into bleeding-edge
Merge remote-tracking branch 'origin/bleeding-edge'