Merge branch 'release/1.2.18' v1.2.18
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 20:27:42 +0000 (15:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 20:27:42 +0000 (15:27 -0500)

Trivial merge