Matplotlib cluster fix

Merged username-removed-914852 requested to merge development into master