Restoring Norah Changes
Merge pull request #2371 from julceslauhub/master

Restoring Norah Changes