Merge branch 'master' into 665-refpages