Merge tag 'v1.1.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 20:28:30 +0000 (15:28 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 20:28:30 +0000 (15:28 -0500)
v1.1.0


Trivial merge