Replacing clunky construct with pyparsing's operatorPrecedence
Merge branch 'master' into env_fault