Change-Id: Ib92a2044ff84108416d315aaf68602b2dd41c7eb Reviewed-by: Daniel Teske <daniel.teske@digia.com>