Updated to AmberDB 1.1.17
Merge branch 'master' into huwr-copies-screen