Merge branch 'matplotlib' to 'master'