Merge tag 'v2.16.79' into v2.17.x

diff --cc cscript
Simple merge

diff --cc platform/osx/make_dmg.sh
Simple merge

diff --cc platform/windows/wscript
Simple merge

diff --cc src/wx/content_menu.cc
Simple merge

diff --cc src/wx/video_panel.cc
Simple merge