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

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