Make ZAP optional for CURVE mechanism
Merge pull request #586 from hurtonm/master

Make ZAP optional for CURVE mechanism