Merge pull request #3811 from colemanw/dynPath