Rollup of 3 pull requests

- Successful merges: #232, #230, #231
- Failed merges: 
p=123