Updated to upstream 1.1.3