flip from zippy to boku
Merge pull request #1974 from andymckay/turn-on-dev

flip from zippy to boku