[vlc/f25] Update to 20170601