fix clearing EJoinElement
Merge branch 'master' into niix