Merge branch 'master' into dftaiwo
Restored missing method in bootstrap
Commiting Database
Merge branch 'dftaiwo'