Merge branch 'fix_master' into 'master'

Fix master

See merge request !5160

tests/application/modules/admin/controllers/IndexControllerTest.php

@@ -240,7 +240,7 @@ class IndexControllerWithGitTest extends Admin_IndexControllerTestCase
     $this->_next_version = BOKEH_MAJOR_VERSION
       . '.' . BOKEH_MINOR_VERSION
       . '.' . (BOKEH_PATCH_VERSION + 1)
-      . BOKEH_NAMED_VERSION;
+      . '-' . BOKEH_NAMED_VERSION;
 
     $mock_http = $this->mock()
                       ->whenCalled('open_url')

tests/library/Class/BokehVersionTest.php

@@ -35,7 +35,7 @@ class BokehVersionTest extends ModelTestCase
     $this->_next_version = BOKEH_MAJOR_VERSION
       . '.' . BOKEH_MINOR_VERSION
       . '.' . (BOKEH_PATCH_VERSION + 1)
-      . BOKEH_NAMED_VERSION;
+      . '-' . BOKEH_NAMED_VERSION;
 
     $this->_mock_http = $this->mock()
                              ->whenCalled('open_url')