Merge "fir a typo that caused up-sampling coefficiens to be wrong"