Merge tag 'V1.2.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:35 +0000 (12:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:35 +0000 (12:26 -0400)
v1.2.18


Trivial merge