Merge pull request #1179 from Diapolo/project-file