merge master into bleeding edge