Include id for a few API resources.]
Merge branch 'master' into 1-apr-2014