Merge branch 'master', remote-tracking branch 'neil/master'
working compile of libgcrypt streamer