Merge commit 8a965d0 (no conflict)

Author: cecton

Dockerfile

@@ -475,7 +475,7 @@ ENV PATH "$SWIFTENV_ROOT/bin:$SWIFTENV_ROOT/shims:$PATH"
 #
 ################################################################################
 USER buildbot
-RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/calavera/install/fc565dc04a2035287b90de7eab16933e59827734/install.sh)"
 ENV PATH "/opt/buildhome/.linuxbrew/bin:$PATH"
 ENV HOMEBREW_PREFIX "/opt/buildhome/.linuxbrew"
 ENV HOMEBREW_CELLAR "/opt/buildhome/.linuxbrew/Cellar"

included_software.md

@@ -66,6 +66,8 @@ The specific patch versions included will depend on when the image was last buil
   * Any version installable via `binrc`.
 * Gutenburg - `GUTENBERG_VERSION`
   * Any version installable via `binrc`.
+* Zola - `ZOLA_VERSION`
+  * Any version installable via `binrc`.
 * [jq](https://stedolan.github.io/jq/) - 1.5
 * [ImageMagick](https://www.imagemagick.org) - 6.7.7
 * [GNU Make](https://www.gnu.org/software/make/) - 3.81