More stuff.
Merge branch 'master' of github.com:gabrielf/devnull
More stuff.