Merge branch 'bip16_0.4.x' into 0.4.x