Merge tag 'v1.1.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:49:38 +0000 (16:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:49:38 +0000 (16:49 -0400)
v1.1.11


Trivial merge