Merge remote-tracking branch 'sonata/master' into fix_sonata_page_block_children_pages
fixed unreliable site detection causing exception when retrieving the selected page setting
Merge branch 'fix_sonata_page_block_children_pages'