Add 06 shtuff.
Merge remote-tracking branch 'upstream/master'