Fix problems with adding new project, fixes #308
Merge branch 'master' into builds
7.699