Merge branch 'hotfix/1.1.0' v1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:20:31 +0000 (12:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:20:31 +0000 (12:20 -0500)

Trivial merge