Use Spree 2-3-stable
Merge branch 'master' into 2-3-stable
add condition to check array is not nil