Added version 1.2
Merge pull request #6801 from CardFlight/master

Added version 1.2