Merge pull request #1201 from timw4mail/develop

Made database parent classes abstract