Fixed libwebp issue.
Fixed libwebp, and typo.
Merge remote-tracking branch 'upstream/master' into docker
Removed dllmap adjustments from startup, mediabrowser needs to use libwebp compiled by Luke.
Merge pull request #938 from HurricaneHernandez/docker

Docker