Merge "PHP 7 compatibility: Fix variable interpolation in ImageGalleryBase.php"