Merge branch '11681-str-newstr' refs #11681
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 11 May 2017 21:27:27 +0000 (17:27 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 11 May 2017 21:27:27 +0000 (17:27 -0400)

Trivial merge