Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:28:55 +0000 (09:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:28:55 +0000 (09:28 -0400)

Trivial merge