correctly uses gsub! (nil on return)
Merge branch 'release/3.0' into dev