copying condition-api-fix branch over from my 2012 repo
10 files changed