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