Merge branch 'master', remote-tracking branch 'origin'
minor changes
Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master', remote-tracking branch 'origin'
Don't try and plot stuff in tests.