Merge pull request

 from master 2014-12-02