Fixed issue #856
Merge and replace pep8mod patch using new settings utility functions