Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 16:29:26 +0000 (12:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 16:29:26 +0000 (12:29 -0400)

Trivial merge