Merge branch 'modrenaud'
authorDavid Feuer <David.Feuer@gmail.com>
Tue, 9 Jan 2018 05:13:08 +0000 (00:13 -0500)
committerDavid Feuer <David.Feuer@gmail.com>
Tue, 9 Jan 2018 05:13:08 +0000 (00:13 -0500)

Trivial merge