Merge tag 'V1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:31:02 +0000 (16:31 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 21:31:02 +0000 (16:31 -0500)
v1.1.1


Trivial merge