t1769: don't call __init__ directly
Merge branch 'master' into bpp-dev