Matteo Corti <matteo.corti@id.ethz.ch> ETH Zurich

Many thanks to:
* Kartthik (bug report)
* Mickey Panaylotakis (bug report)
* Thomas Milz (bug report)
* Brian Kahne (bug report and patch: see ChangeLog)
