simplified
Merge remote-tracking branch 'origin/empty_and_not_empty' into empty_and_not_empty

Conflicts:
	When/src/main/java/houtbecke/rs/when/DefaultConditionThings.java