Fixed a bug reported in
http://www.universalmediaserver.com/forum/viewtopic.php?f=9&t=1874
Merge remote-tracking branch 'UMS/master'