Rollup of 1 pull requests

- Successful merges: #268
- Failed merges: #269