Merge branch 'next-release' into 'f_modularization_wip_rebased'

# Conflicts:
#   index.php

diff --cc README.md
Simple merge

diff --cc index.php
Simple merge

diff --cc lib/functions.php
Simple merge

diff --cc script.php
Simple merge