Merge tag 'v1.0.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:28:44 +0000 (14:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:28:44 +0000 (14:28 -0400)
v1.0.11


Trivial merge