Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:14 +0000 (15:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:14 +0000 (15:59 -0500)
v1.0.18


Trivial merge