from somewhat worthless intercept to medium
Merge branch '1.x' into gh-pages