fixes #1166 (closed) and also that issue sjw had
assigned to @hj
changed the description
merged
mentioned in commit 15229d27