fixing lhs...
Merge remote-tracking branch 'origin/0.6.x' into 0.6.x