Merge branch 'block-next' into HEAD
authorJeff Cody <jcody@redhat.com>
Fri, 14 Aug 2015 13:41:30 +0000 (09:41 -0400)
committerJeff Cody <jcody@redhat.com>
Fri, 14 Aug 2015 13:41:30 +0000 (09:41 -0400)

Trivial merge