Merge tag 'v1.1.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:47:35 +0000 (15:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:47:35 +0000 (15:47 -0400)
v1.1.1


Trivial merge