Merge pull request #741 from nathantsoi/boards/omnibus