Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:15:43 +0000 (15:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:15:43 +0000 (15:15 -0400)
v1.0.18


Trivial merge