Periodic merge 20130617