Merge branch 'hotfix/1.1.13' v1.1.13
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:34:07 +0000 (11:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:34:07 +0000 (11:34 -0400)

Trivial merge