Merge remote-tracking branch 'downstream/develop' into develop

Just merging from downstream.
Merge remote-tracking branch 'downstream/develop' into develop

Merging from downstream.
Merge branch 'develop' of https://github.com/codywd/WiFiz into develop

Required to get up to date