Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:49:12 +0000 (11:49 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:49:12 +0000 (11:49 -0500)

Trivial merge