Merge tag 'v1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:33:03 +0000 (13:33 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:33:03 +0000 (13:33 -0500)
v1.1.1


Trivial merge