Merge master with docs

Branch is in stable state.