Merge in latest changes to CRX options page boilerplate