Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:32:00 +0000 (11:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:32:00 +0000 (11:32 -0500)

Trivial merge