Merge pull request #283 from ds22x/master

Fix hi-res mode crashing + sync to upstream
18 jobs for master in 36 minutes and 28 seconds (queued for 121 minutes and 30 seconds)
latest