Apply CR
Merge branch 'master' into conditions
Merge branch 'conditions' of github.com:ogail/IStrategizer into conditions