Initial patch for 11.10
Previous patch was missing new files (-N)
Merge pull request #1 from AlexandreFournier/master

Initial patch for 11.10