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