Local merge
Merge branch 'aggregate-qr' of https://github.com/solomonik/NuLAB into aggregate-qr