Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:14:01 +0000 (13:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:14:01 +0000 (13:14 -0500)

Trivial merge