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

Signed-off-by: smmurphy <info+git9441b52d851289b17f4e02b00c48069f@thereferentialprocess.org>
Merge branch 'master' of https://github.com/DAAP/DAAP9.6.git