Upgrade to Standards-Version 3.9.4