Merge branch 'release/1.7.14' v1.7.14
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Jan 2019 15:54:21 +0000 (10:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Jan 2019 15:54:21 +0000 (10:54 -0500)

Trivial merge