Manually merged files from mac branch to archilnux.