FFMS/ffms2 — pull request #125 by qyot27 (2013-09-25 23:19:10+00:00)
Title: Minor HEAD catchup + fixes

It'd probably also be a good idea to cherry-pick the last commit in this pull request into master.