added collision with ice v0.1.4.a23
Merge branch 'v0.1.4.a23' into v0.1.4.a1