[#2453] Update OS X support.