Merge tag 'v1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:29:13 +0000 (11:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:29:13 +0000 (11:29 -0500)
v1.1.1


Trivial merge