Merge tag 'v1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:43:07 +0000 (14:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:43:07 +0000 (14:43 -0400)
v1.1.1


Trivial merge