Working on fixing this damn line separator issue.
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision