Import v1.2.0

Signed-off-by: Dan Dennedy <dan@dennedy.org>
28 files changed