Merge develop into builder-refresh.

    Conflicts:
        src/inc/builder/core/api.php
        src/inc/builder/core/base.php
        src/inc/builder/core/templates/section-footer.php
        src/inc/builder/sections/builder-templates/text.php