barosltestest/test — pull request #235 by homu (2014-12-18 10:08:14+00:00)
Title: Rollup of 3 pull requests

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