Hacked tag version until bugfix is accepted upstream.