Merge tag 'v1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:23:06 +0000 (12:23 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:23:06 +0000 (12:23 -0500)
v1.1.1


Trivial merge