merge diff from 'illumos:master' 2014 May 29 - 30