Fixed incorret forward reference in conditional_base
Merge branch 'master' of https://github.com/pfultz2/Zen