Forgotten changes. Sorry.
Merge branch 'refs/heads/master' into nodenet_sheaves