add parseInt() check before comparing zIndex values
Merge branch 'dev-master' into dev-3.x