This was backported to 0.9.7

See #610