2.6

Created originally on Bitbucket by Leetao (tao lee)

Was already merged in Bitbucket before import, marked as merged by the import user

fix test test_writer failed