Merge branch 'hotfix/1.1.13'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 13:05:10 +0000 (09:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 13:05:10 +0000 (09:05 -0400)

Trivial merge