made compatible with alpha94
compatible with alpha-96
Merge branch 'master' of https://github.com/tzyganu/m2-sample-data