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