Add 6.1 support; target Yosemite