[fixed] stability issue
Merge branch 'unstable' of ssh://TheAnswer@review.swgemu.com:29418/Core3.git into unstable