fixing last commit ...
Merge branch 'rc2_0.8.4' into releases