Fix infinite recursion in User JSON
Merge remote-tracking branch 'origin/master'