Merge pull request #5474 from willcrichton/master