Merge branch 'v0.12-py25' into v0.12-py24