Merge pull request #5658 from berak:akaze_fix