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