Tidying up some mess
Merge branch 'master' into dbfusion