Add more space before and after code snippets
Merge branch 'master' into 2014