Rollup of 3 pull requests

- Successful merges: #230, #231, #232
- Failed merges: 
r-