Making sure v1.0.x and master are equal

Just an 'administrative' pull request, which I'll merge myself.