Bring over dist.ini from master