Merge "Tweak default ignore-assets path"