Reapply previous commit
Revert commit
Reapply previous commit
Revert commit
Merge branch 'master' of https://github.com/acidvertigo/oscommerce2