[MERGE] s/// return value fixups
authorDavid Mitchell <davem@iabyn.com>
Tue, 19 Dec 2017 15:40:41 +0000 (15:40 +0000)
committerDavid Mitchell <davem@iabyn.com>
Tue, 19 Dec 2017 15:40:41 +0000 (15:40 +0000)

Trivial merge