Avoid conflicts with appia branch.
More on conflict resolution.
Merge branch 'master' into gui3