Update docs
Merge branch 'maint-1.2' into maint-1.3

* maint-1.2:
  Update docs
Update docs