Comment pointing users to the setup bits.
Merge branch 'master' into ospalh-special