Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 Nov 2016 13:06:34 +0000 (09:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 Nov 2016 13:06:34 +0000 (09:06 -0400)

Trivial merge