BUG #14247: COMMENT is restored on wrong database

The following bug has been logged on the website:

Bug reference: 14247
Logged by: Peter Gerber
Email address: pgerber(at)tocco(dot)ch
PostgreSQL version: 9.5.3
Operating system: Linux
Description:

Comments on a databases are restored on the database named the same the dump
was made from. For instance, if a dump is made from a database called
'source_db' and restored into 'target_db' the comment is restored on the
wrong database, 'source_db'.

How to reproduce:
1: CREATE DATABASE source_db;
2. COMMENT ON DATABASE source_db IS 'test';
3. pg_dump -Fc -d source_db -f dump;
4. COMMENT ON DATABASE source_db IS null;
5. CREATE DATABASE target_db;
6. pg_restore -d target_db dump
7. SELECT datname, description FROM pg_shdescription
JOIN pg_database ON objoid = pg_database.oid
WHERE datname in ('source_db', 'target_db');
datname | description
-----------+-------------
source_db | test
(1 row)

Also, if pg_dump is done without -Fc it contains this line:
COMMENT ON DATABASE dbrefactoring_new_210 IS 'test';