Merge pull request #1907 from gpazo/fixent-install