Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:44:10 +0000 (14:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:44:10 +0000 (14:44 -0400)

Trivial merge