This really should have been part of !44 (merged), but I forgot to push.
mentioned in commit 8f69d6d6
merged