Merge branch 'hotfix/1.1.13b' v1.1.13b
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 14:28:56 +0000 (10:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 14:28:56 +0000 (10:28 -0400)

Trivial merge