barosltestest/test — pull request #226 by homu (2014-12-18 10:02:59+00:00)
Title: Rollup of [189, 190] pull requests

- Successful merges: #189, #190
- Failed merges: