Doh ... there's always something I've forgotten
Merge branch 'master' of github.com:waveform80/picamera