Merging OS 3.11.
Fix conflicts.
Merge pull request #13 from Gizra/12

Merge 3.11