Merge pull request #41 from geissonator/master

Enable OCC on Habanero