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


Trivial merge