Fix integration schedule
fix conflict merge
Release 20130626.0