Testing the settings page.
Merge remote-tracking branch 'origin/master'