Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:22:50 +0000 (12:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:22:50 +0000 (12:22 -0500)

Trivial merge