Merge branch 'rtd-configfile' into 'master'