Net was broke and now it is fixed.
Merge remote-tracking branch 'remotes/derek/master' into mergeall3