AFR calendar item export margins
Apply menu block styles to core menu blocks in sidebar second
Merge branch 'refs/heads/master' into test