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

Trivial merge