Merge branch 'hotfix/1.1.3'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:07:10 +0000 (15:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:07:10 +0000 (15:07 -0400)

Trivial merge