Merge pull request #634 from smuehlst/opj_aix_issue_633