Merge branch 'master' of github.com:kaelzhang/cortex
#248: temp retains fs-sync for util/package