Merge changes Ic7725e27,Ib3d54bfa into cayuga

* changes:
  Update AUTHORS
  Update .mailmap entry for Ralph Giles