Merge ignore-glob updates to trunk