Merge remote-tracking branch 'regulator/fix/arizona' into regulator-linus