(Partially) update to 99d6956c3 2014-12-18 20:32:07 +0000.