Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:12 +0000 (14:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:12 +0000 (14:04 -0500)

Trivial merge