Merge branch 'jpittman' into RSherman_LEX