Merge branch 'master' into develop
Add mode lines
Delete unused functions and definitions
Merge branch 'develop'