Merge branch sourcepit/b2#1