use jide 3.6.1
Merge branch 'master' into nestmod