Merge pull request #4 from Itseez/2.4

OpenCV changes
Fix bilateralFilter function
Merge pull request #1300 from kdrobnyh:FilterBilateral