Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:48:28 +0000 (10:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:48:28 +0000 (10:48 -0400)
v1.0.18


Trivial merge