Upstream changes: 1.3130 2014-09-15 [BUG FIXES] - Bogus dependency for 'mro'. (GH#1069) [STATISTICS] - code churn: 2 files changed, 21 insertions(+), 12 deletions(-)