Merge remote-tracking branch 'fork/fix-site-generation' into master