Merge tag 'v1.2.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 20:30:13 +0000 (15:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 20:30:13 +0000 (15:30 -0500)
Version 1.2.18


Trivial merge