Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 16:33:41 +0000 (11:33 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 16:33:41 +0000 (11:33 -0500)

Trivial merge