merge working copy to garemoko master