Merge branch 'master' into regression
ccap books preface page headers
Merge branch 'regression' into dev