Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:03:28 +0000 (11:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:03:28 +0000 (11:03 -0500)

Trivial merge