Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:04:02 +0000 (15:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:04:02 +0000 (15:04 -0400)

Trivial merge