Fixed incorrect reference to controller->isRest boolean
Merge branches 'master' and 'statusCodes'