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