Pushing up a change so I can use 6.1 by default for development