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

* commit '6ed4b9dfd6130f4517af5a99d99c5cb125600baa':
  Deep-copying sucks when all you want is a borrow