Merge branch 'hotfix/1.1.2' V1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Nov 2015 14:10:16 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Nov 2015 14:10:16 +0000 (09:10 -0500)

Trivial merge