Synced 6.x branch with 7.x branch for patches to apply cleanly.

	modified:   textcaptcha.module