Upstream merge and line endings fix

Hi,

Merged with upstream and fixed line endings for the admin page.