Fixed state of pakcages
Merge remote-tracking branch 'devel/issue_562_newer_matplotlib' into devel-master