Merge pull request #1104 from ghost1227/master

Proposed addition of Extensions settings tab - Take 2
Proposed fix for #1107