Merge pull request #1593 from ilya-lavrenov:ocl_war_on_double