Merge branch 'release/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:28:37 +0000 (14:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:28:37 +0000 (14:28 -0400)

Trivial merge