Merge pull request #1739 from odoo-dev/master-watchdog-fme