am 31b81b3c: am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev

* commit '31b81b3cb94befad39d1632d449b0a4d6eedf604':
  Deep-copying sucks when all you want is a borrow