Merge branch 'master' into debian
Enable USE_VOIP and remove unnecessary build dependency on xvidcore.