Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:46:31 +0000 (12:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:46:31 +0000 (12:46 -0500)

Trivial merge