Back to 1.6.0-dev