barosltestest/test — pull request #245 by homu (2014-12-18 11:10:42+00:00)
Title: Rollup of 2 pull requests

- Successful merges: #231, #232
- Failed merges: #241, #239