Merge tag 'v1.1.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:27:56 +0000 (13:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:27:56 +0000 (13:27 -0500)
Version 1.1.18


Trivial merge