Merge master to get fixes up to 1.2.1