'next' now merged to 'master'