Flakey
Merge pull request #907 from psav/flake

Flakey
Fixed upstream flash detection
Merge pull request #908 from seandst/sorry-i-broke-flash-upstream

Fixed upstream flash detection