Fix example code in Scientific Python 7
Merge branch 'master' into gh-pages