Merge "Add 2 new options to importImages.php"