Merge pull request #641 from smuehlst/opj_hp_issue_640