Merge branch 'user/rogan/lp1739029_additional_novelist_parameters' of git://git.everg... user/rogan/lp1739029_additional_novelist_parameters
authorRogan Hamby <rogan.hamby@gmail.com>
Fri, 19 Jan 2018 16:54:34 +0000 (11:54 -0500)
committerRogan Hamby <rogan.hamby@gmail.com>
Fri, 19 Jan 2018 16:54:34 +0000 (11:54 -0500)

Trivial merge