Merge branch 'hotfix/1.1.12'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:03 +0000 (16:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:03 +0000 (16:57 -0400)

Trivial merge