Merged with videofile support hg repo