Merge branch 'hotfix/1.1.12' V1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:14:34 +0000 (11:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:14:34 +0000 (11:14 -0500)

Trivial merge