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