remove user skipping
rewrite to be OnApp 3.2 compatible
Merge branch '3.2' into 'master'
update version