Fixed wrong date
Merge branch '1.2.x'