Change 3993

Barrie Slaymaker
Request Review
- Fold in changes from clkao's SVN work
5 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.