docstring fix
Merge branch 'master' into mb/liveplot
Merge branch 'mb/liveplot'