Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:34:31 +0000 (13:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:34:31 +0000 (13:34 -0500)

Trivial merge