Deal with undefined or missing rag/calc definitions
Merge branch 'master' of https://github.com/ctrlo/GADS