Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 14:49:09 +0000 (10:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 14:49:09 +0000 (10:49 -0400)

Trivial merge