Core: PR # 129 Add possibility to override contexts, locales and sites in an appdesk config
Merge Chiba 2
Merge remote-tracking branch 'origin/master/dubrovka' into master/elche