Importing neolith 0.4.48 into git
Merge branch 'master' of https://github.com/novaedge/neolith