Merge branch 'master' into node-from-source
Merge branch 'node-from-source' of github.com:makeusabrew/horde into node-from-source