Empty line before code block is not optional
Merge branch 'master' into 3.6