"next" branch now merged to master