kgardas authored Feb 18, 2014 and thoughtpolice committed Feb 20, 2014

The patch is provided by Christian Maeder <Christian.Maeder@dfki.de>

Signed-off-by: Karel Gardas <karel.gardas@centrum.cz>
Signed-off-by: Austin Seipp <austin@well-typed.com>
(cherry picked from commit e638acb6)