removed helpers.done
Merge remote-tracking branch 'origin/0.5.1' into cluster