Fix test in people controller (JDT)
Merge remote-tracking branch 'origin/master'