Switch to official display branch
Merge branch 'master' of https://github.com/Eyescale/config