Merge remote-tracking branch 'origin/jpittman' into RSherman_LEX

Square buttons for Pittman