fix issue with null values in PropertyConditionEvaluator
Merge remote-tracking branch 'origin/master'