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

* commit '30eaf590f247ac0a14d199bf4685a84726ffb691':
  Simplify matrix copy constructor/load