Merge branch 'hotfix/1.1.0' V1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:02:14 +0000 (16:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:02:14 +0000 (16:02 -0500)

Trivial merge