[master] 20130724 1345