Rollup of 2 pull requests

- Successful merges: #231, #232
- Failed merges: #241, #239