Rollup of 1 pull requests

- Successful merges: #267
- Failed merges: #268, #269
retry