Merge "Fix issues with Prolog files in Eclipse" into stable-2.6