@Cadair, no one has replied the mail about 2.6 that @ehsteve sent, so I could even consider to drop it even now... but we can get 0.4 as it is and revert that change for the new master.