Merge latest version of ps3mediaserver/master

It's been a while since pms-mlx/master was merged with ps3mediaserver/master. This is my attempt at merging the two. :smiley: