am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev

* commit '54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793':
  Simplify matrix copy constructor/load