Merge pull request #4178 from awojnowski/master