Merge branch 'release/1.1.0'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 20:30:43 +0000 (15:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 20:30:43 +0000 (15:30 -0500)

Trivial merge