Avoid dev-master - it's evil!

Replaces #399.