Merge pull request #635 from Kinematics/4.1-dev

4.1 dev