Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 15:46:49 +0000 (11:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 15:46:49 +0000 (11:46 -0400)

Trivial merge