Change-Id: I5e4a1a2441765a002097492c7ac71fb07c91b442 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>