Merge pull request #1952 from ktsaou/master