Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:22:39 +0000 (09:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:22:39 +0000 (09:22 -0400)

Trivial merge