merge richardbutler:master