Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:29:01 +0000 (17:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:29:01 +0000 (17:29 -0500)
v1.0.18


Trivial merge