Release 1.2.0

Merged from preview; not sure I did this merge right