Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Feb 2017 20:24:18 +0000 (15:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Feb 2017 20:24:18 +0000 (15:24 -0500)

Trivial merge