barosltestest/test — pull request #246 by homu (2014-12-18 11:11:15+00:00)
Title: Rollup of 3 pull requests

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