merge 20130820