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