Merge branch 'illumos'