fix parse error because of unclosed block
Merge branch 'master' into wider-content-area