Merge tag 'v1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 1 Aug 2016 12:43:24 +0000 (08:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 1 Aug 2016 12:43:24 +0000 (08:43 -0400)
v1.1.1


Trivial merge