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