Merge remote-tracking branch 'up/master' into hnet