Merge release-0.12.0 to master

@daaray noticed that since release 0.12.0 is out, we probably want to make that available in master (while maintaining the release-0.12.0 branch, so that updates can be made later).