Merge branch 'jpittman' into RSherman_LEX
Pitman's check boxes.

BAM—