Merge remote-tracking branch 'origin/master' into lp1739029_additional_novelist_param...
authorRogan Hamby <rogan.hamby@gmail.com>
Fri, 19 Jan 2018 16:52:23 +0000 (11:52 -0500)
committerRogan Hamby <rogan.hamby@gmail.com>
Fri, 19 Jan 2018 16:52:23 +0000 (11:52 -0500)

Trivial merge