Merge pull request #283 from ds22x/master

Fix hi-res mode crashing + sync to upstream
18 jobs for master in 34 minutes and 13 seconds (queued for 118 minutes and 41 seconds)
latest