update 2.1.12
update 2.1.12 es
Merge remote-tracking branch 'upstream/master'

Conflicts:
	i18n/languages/woocommerce-ro_RO.mo
	i18n/languages/woocommerce-ro_RO.po