Revert "Merge branch 'bcouturi_RemoveGlobalConditions' into 'master'"

Christopher Rob Jonesrequested to merge
revert-9cb53004 into master

This reverts merge request !142 (merged)

Edited by Christopher Rob Jones

Merge request reports