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