Merge branch 'master' into fmt

Cargo.lock

Cargo.toml

src/api/admin.rs

src/api/core/mod.rs

src/api/core/two_factor/duo.rs

src/api/icons.rs

src/static/templates/admin/settings.hbs

src/util.rs