Change-Id: I75fb11698d3ae305751da59af03c1853add7122e Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>