StrSubstitutor: added a default value
Merge remote-tracking branch 'origin/master'