Make notion of empty string more general
Merge remote-tracking branch 'origin/master'