Merge pull request #6 from patrickhidalgo/12348_make_patrickh_work_master

12348_make_patrickh_work_master