sync cvs as of 2013-07-02