Merge branch 'hotfix/1.1.1' V1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:30:57 +0000 (16:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:30:57 +0000 (16:30 -0500)

Trivial merge