Merge pull request #1 from matplotlib/master

update repo
Merge branch 'master' of https://github.com/Tillsten/matplotlib
avoid np.nan values in colors array returned by axes3d._shade_colors
make sure fill values for shade array are within the correct range
Merge pull request #3031 from jrjohansson/fix-axes3d-shade-color

avoid np.nan values in colors array returned by axes3d._shade_colors
Merge remote-tracking branch 'origin_f/master'
symlog-scale: Remove asssert linscale >= 1.

I can't see why the assert was needed and it does excatly what i would expect from it.
symlog-scale: Remove asssert linscale >= 1.

I can't see why the assert was needed and it does excatly what i would expect from it.