Merge branch 'release/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:41:07 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:41:07 +0000 (16:41 -0500)

Trivial merge