commit 2014-06-25 08-02