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

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