Merge remote-tracking branch 'origin/master' into module
Merge branch 'module' of github.com:trungnh/magentoce1810 into module