v1.1.3, targeting core1.70 (commit: a7c3922)
semi-automated cleanup to match new core (commit: f5620d0)