Merge "Add mkstrip"