Merge pull request #4476 from lukbaj/master