Minor housekeeping
Merge branch 'Proplex-master'