Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:55 +0000 (11:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:55 +0000 (11:43 -0500)
v1.0.18


Trivial merge