correct cocoa macro
Merge branch 'master' into quota-mgt
update documentation
code cleanup
Merge branch 'master' into quota-mgt