pull in new amberDb
Merge remote-tracking branch 'origin/master' into dsc-807