Fixes #1897 Unneeded query within usercp.php
Merge remote-tracking branch 'origin/stable'