cmake: FindICE wasn't looking in the cmake prefix properly to find the include files.
Merge branch 'maint'
Merge branch 'master' into next