[jes: includes patches from Michele Ballabio] Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>