Backporting master to unstable

Some changes have been included in master (e.g. README edits). Let's bring them to master as well.