Updated Matterhorn to 1.6.0-RC1
Updated ffmpeg to 2.5