Merge tag 'v1.1.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Aug 2016 20:44:10 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Aug 2016 20:44:10 +0000 (16:44 -0400)
v1.1.11


Trivial merge