140630 commit