Better handling of fenced blocks
Merge branch 'master' into demo