Reload the page if the user is editing the options from the popup
Merge remote-tracking branch 'origin'