Merge branch 'hotfix/1.1.0' v1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:22:41 +0000 (13:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:22:41 +0000 (13:22 -0500)

Trivial merge