Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:42:54 +0000 (10:42 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:42:54 +0000 (10:42 -0500)

Trivial merge