dipa's changes to fix editing
fdafd
Merge remote-tracking branch 'origin/festival-independent' into festival-independent

ffda this merge is necessary,