Merged Ludwig's change applied by Thomas broken by Martin's pull request ;)

- See bug 807507