[PATCH 0/5] Editorial and trivial changes for v0.6