Merge branch 'release/1.1.0' v1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:39:34 +0000 (14:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:39:34 +0000 (14:39 -0400)

Trivial merge