[master] 20130722 2342