sage

971c0b1f - Merge remote-tracking branch 'upstream/develop' into alexjbest/doc-fixes