[dvdstyler/f38] (2 commits) ...add the latest (3) commits of upstream