Merge branch 'master' of https://github.com/bromite/bromite into fix-issue-271