Fix formatting and inconsistent indentation.
Merge remote-tracking branch 'origin/master' into grid-material
Completely revert Volumes demo.