Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Wed, 29 Mar 2017 23:58:34 +0000 (20:58 -0300)
committerDavid Bremner <david@tethera.net>
Wed, 29 Mar 2017 23:58:34 +0000 (20:58 -0300)
Another regexp search fix.


Trivial merge