ZP-830 Combined; minor formatting fixes. Released under the Affero GNU General Public License (AGPL) version 3.