Merge branch 'release/1.1.0' v1.1.0
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:33:36 +0000 (15:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:33:36 +0000 (15:33 -0400)

Trivial merge