matplotlib: modernize deps
scipy: bump revision for new gcc lib paths
Merge remote-tracking branch 'upstream/master'