2.1 merge 2.0

Ping @nawroth -- please check that the manual parts have been merged correctly.