100char edit I spotted
Merge branch 'master' into config_v1.1