[2014-02] merge from upstream