Missing $db...
Merge branch 'master' into custom