Merge branch 'hotfix/1.0.11'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:46:40 +0000 (10:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:46:40 +0000 (10:46 -0500)

Trivial merge