I pushed the second fix. Interestingly enough, wrasse failed in the 013_partition test. I don't see how that could be caused by this particular commit, though - see the pgsql-committers thread [1].
I'd like to test & polish the main patch over the weekend, and get it committed early next week. Unless someone thinks it's definitely not ready for that ... [1] https://www.postgresql.org/message-id/E1nUsch-0008rQ-FW%40gemulon.postgresql.org -- Tomas Vondra EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company