Merge pull request #2949 from zorun/master