* commit '5ee46844':
  ZP-830 Combined; minor formatting fixes. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 21fb7d6b)