markmoxon Merge branch 'flicker-free' of https://github.com/markmoxon/disc-elit…