Merge tag 'v1.1.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 13:34:59 +0000 (09:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 13:34:59 +0000 (09:34 -0400)
v1.1.11


Trivial merge