Update docs.
Merge invalid and valid 0.5-maint