Merge continuous2 and master.