Merging in master into puppet