replace gets
Merge remote-tracking branch 'gegel/master' into newbuild