Merge "Adds two new subpel search methods"