Merge commit 'rafl/blead' into blead