This commit only includes file and text change from pacman -> bottle. Nothing else has been modified.
