Merge remote-tracking branch 'origin/master' into staging * origin/master: fix BCD mask for date (Solaris 2.5 guest hang fix)