Comment blocks (lines prefixed with "%")
Merge branch 'victor' into master-local