ENH: Add support for 2.6, 3.3