Remove orphan layout block if no content found
Merge branch 'refs/heads/master' into 2.1