sage

4e0bf852 - Merge branch 'develop' into matplotlib_pillow_update