fix by message 25/06/2014
Merge remote-tracking branch 'origin/master'