Merge origin/master, keep notebook fixes

Resolve conflicts in 28_Rasterize.ipynb by keeping our fixed version
(legend_kwds 'label' instead of removed 'title' kwarg).

Author: brendancol