am c70f3db8: Merge "Simplify matrix calculations"

* commit 'c70f3db80ad522bdb5938b5944b3d9c7d7758f12':
  Simplify matrix calculations