barosltestest/test — pull request #253 by homu (2014-12-19 14:26:16+00:00)
Title: Rollup of 3 pull requests

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