Merge "Add missing conf.py import"