Upgrade to support-v4, r13