Merge tag 'v1.1.1'