Merge branch 'hotfix/1.0.13'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 20:16:14 +0000 (15:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 20:16:14 +0000 (15:16 -0500)

Trivial merge