- Apply patch from Justin Hunter: