M.Q. Dic/Rec/AFR
Merge branch 'layout' into gh-pages