Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:35 +0000 (09:13 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:35 +0000 (09:13 -0500)

Trivial merge