Merge branch 'hotfix/1.1.11' V1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:31:22 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:31:22 +0000 (09:31 -0400)

Trivial merge