Merge tag 'v1.1.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:22:49 +0000 (13:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:22:49 +0000 (13:22 -0500)
v1.1.0


Trivial merge