Change-Id: I5f7cdcede593cdce2c577315ccead95e8841870e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>