Merge branch '1.2'
Fix README