Merge branch/2014-04-15/mvffnoseg into the master sources.