use new settings_actions hook (c49c35c)
Merge branch 'master' into release-2.0