Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  fixup!: Fix omitted documentation
  fixup!: Fix omitted import plugins and libraries
  Display Used Permits in addition to permits available
  Add readable text to the limit type

Change-Id: I64d23d6df67afd1a40b7ad5205faed907e492c6d