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

* commit 'df134e8722efe489ccdc23cb276c98e20ff74738':
  Simplify matrix copy constructor/load