Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:28 +0000 (16:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:28 +0000 (16:47 -0400)

Trivial merge