Merge tag '04/01/13' into David

Revision emailed out on 04/01/13
David's second round of revisions.
Merge branch 'David'
Merged and modified David's edits.