Merge branch 'master' of https://github.com/DAAP/DAAP9.6.git

Signed-off-by: smmurphy <smurphy1+Gitd5a67d79af91ffb4ffee9e64d2e74c94@gmail.com>
Merge branch 'master' of https://github.com/DAAP/DAAP9.6.git