Merge remote-tracking branch 'origin/products_index_masonry' into geoff_bugs
Merge branch 'geoff_bugs'