fixed clang errors (again?)
Merge remote branch 'upstream/master'
Merge remote branch 'origin/clang-fix-again'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'origin/master' into gridgraph