Rollup of 2 pull requests

- Successful merges: #189, #190
- Failed merges: 
r+