Some old fixes that weren't checked in. These are all in tutorials that are semi-deprecated.
Merge remote-tracking branch 'origin/master'