Merge pull request #869 from ey6es/master

Need to #ifdef this out to avoid linking against nonexistent quazip on L...