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