Merge "Fisheye filter:  approx version, general performance improvements" into jb-mr1-dev