update upstream 2.1.5
update 2.1.5
Merge remote-tracking branch 'upstream/master' into testing

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