API should output role id in nested role objects
Merge remote-tracking branch 'origin/master'