Merge pull request #1066 from odoo-dev/master-setting-paa