Merge pull request #819 from Windower/4.1

Updated missing conflicting values
Merge pull request #820 from Windower/4.1-dev

Merge pull request #819 from Windower/4.1