Merge "Annotate References with their referent." am: 530dcc8b74
am: d47b6a36a1

* commit 'd47b6a36a110fcd5be2e93149e7e8d63502b5ce7':
  Annotate References with their referent.