Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:09 +0000 (12:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:09 +0000 (12:46 -0400)

Trivial merge