Train 2013.07.31+hotfix 868967

This was hotfixed on train-2013.07.17 after train-2013.07.31 was branched. Therefore we need to hotfix this train too.