Fix magic properties.
Merge in latest master
Bump docs.