Merge remote branch 'upstream/master' into macdx