Merge upstream 2014-07-02