merge into macosx from master