Update to upstream 2.1.3

cc @charliesome @tmm1