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