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


Trivial merge