Merge tag 'V1.1.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:31:27 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:31:27 +0000 (09:31 -0400)
v1.1.11


Trivial merge