FYI #903 is now merged into master.