Change-Id: I8f038479f31a282db256144a3254e438eb6a629f Reviewed-by: Marco Bubke <marco.bubke@digia.com>