meteor 0.6.5 support
Merge remote-tracking branch 'origin/0.6.5'