Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:45 +0000 (08:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:45 +0000 (08:57 -0500)

Trivial merge