moving master to work on 6.1.0-dev