1.2

Updates from upstream