Merge branch 'new-doc-strategy' into 'master'

New doc strategy

See merge request !23
5 jobs for master in 8 minutes and 13 seconds (queued for 4 seconds)