Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 21:01:58 +0000 (17:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 21:01:58 +0000 (17:01 -0400)

Trivial merge