Merge tag 'v1.1.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Nov 2017 15:44:25 +0000 (11:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Nov 2017 15:44:25 +0000 (11:44 -0400)
v1.1.18


Trivial merge