fixed bug.
Merge remote-tracking branch 'origin/20130828'