Merge "Allow override of extension directory"