A day's worth of work
Merge branch 'master' of gh:anzenehansen/Blesta-Goodies