Merge branch 'pcolorargs'