Merge branch 'bradsdavis-master_old' into bradsdavis-master
Fix for a couple of mistakes in merging/rebasing bdavis changes
Merge branch 'bradsdavis-master'
WINDUP-199: Iteration simplification (pass iteration variable names to conditions/operations)
WINDUP-199: Tests