Indent issues, strict type match.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev