Dial back some over-zealous specialisations
Merge branch 'master' of https://github.com/aranlunzer/shiny