Back port sharper.inc commit from master to RELENG_2_1
Merge pull request #662 from jean-m-cyr/RELENG_2_1

Back port sharper.inc commit from master to RELENG_2_1