Merge pull request #5967 from SiR-DanieL/master

Fixed issue #5895
Merge branch 'master' of https://github.com/woothemes/woocommerce