Bumped version to 1.2.1
Bumped version to 1.2.1
Merge branch 'magento_de_master'