Import upstream CVS Fri, 12 Sep 2014 22:57:45 +0200

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>