Partially reverted change from https://github.com/ps3mediaserver/ps3mediaserver/commit/e0a8ea173219850c7f149bcc0be26cea7f72966d
Merge branch 'PMS' of github.com:UniversalMediaServer/UniversalMediaServer into PMS