Merge remote-tracking branch 'origin/prod'

# Conflicts:
#	app/Fluidbook/Compiler/Compiler.php

diff --cc app/Fluidbook/Compiler/Compiler.php
index 3496714b208e6f3ebc14ea691f6637b6a18bacda,3c49bc0eb8ac85730e7696878b18a6a3c6590849..34550485db63ce7a9b7a30929f81eddb0b8414c6
--- 1/app/Fluidbook/Compiler/Compiler.php
--- 2/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@@ -1791,12 -1786,12 +1786,12 @@@ class Compiler extends Base implements 
  
      public function getWidth($page = 1)
      {
-         return $this->getPageDimension($page)[0]??null;
 -        return $this->getPageDimension($page)[0] ?? null;
++        return $this->getPageDimension($page)[0] ??null;
      }
  
      public function getHeight($page = 1)
      {
-         return $this->getPageDimension($page)[1]??null;
 -        return $this->getPageDimension($page)[1] ?? null;
++        return $this->getPageDimension($page)[1] ??null;
      }
  
  

diff --cc app/Fluidbook/Link/LinksData.php
Simple merge