fixed unloadAll
Merge remote-tracking branch 'origin/1.2' into devel