Development merging branch of x264, i.e. my local tree.