12348_make_patrickh_work_master

Get 'er done!