Merge branch '2447-cp-overwrite'
authorBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:39:39 +0000 (17:39 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:39:39 +0000 (17:39 -0700)

Trivial merge