[@sambauers Participant 17 years, 9 months ago]

Changes are now in trunk, please test.

0.9 may be a little more hackish to implement.