Merge remote-tracking branch 'dean/qa' into qa
Removing defunct User::Remove() method
Fixing code accidentally imported from develop branch
Merge remote-tracking branch 'patrick/qa' into qa