fix bug of the updated feedback 2012
Merge remote-tracking branch 'origin/master'