This branch doesn't solve #2308 (closed), but it may fix #1775 (closed) (@grote found steps for reproducing the bug).