Draft dual-stack text
Merge remote-tracking branch 'upstream/master'
updates
edits
edits
fix merge conflicts, which did not seem to be very conflicting at all...