Merge remote-tracking branch 'origin/5.4' into 6.0

* origin/5.4:
  Make various changes/updates on the Lock docs

Author: wouterj