Merge branch '1.0' into 1.0-seek

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

diff --cc src/wx/timecode.h
Simple merge

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