Conflicts: install/sql/incremental/upd_dev_collection.sql server/plugins-available/bind_plugin.inc.php